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