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