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