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