tree f0f7ce16f0cf1d769920cf59106463fdded4a598
parent 401b2e2fe058e2a9c34c8f88f9d6cff72f59ed7c
parent 5b9145dd185084de6607647489b4e69479648ddc
author Evan Chen <evanxinchen@google.com> 1630910293 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630910293 +0000

Backporting the change of ag/15629060 to pi-dev am: 95ff59db3b am: e317818b24 am: 8f758cff77 am: 30d1571a99 am: 5b9145dd18

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748731

Change-Id: I487a0850c280f68685e430163807c7c2a95515ef