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