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