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