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