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