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