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