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