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