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