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