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