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