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