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