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