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