Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17942483 Change-Id: Ic4fe2ca2e39fc2f75eedf89b5eefb81f9ba6c59e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>