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