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