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