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