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