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