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