[automerger skipped] Merge commit '0ac895d9' of persistent-https://googleplex-android.git.corp.google.com/platform/frameworks/base into merge_conflict am: 2ed26021 -s ours

am skip reason: Change-Id I306dfc37155caf0c3d9c5db23e1fdc9d5d37399e with SHA-1 bdabcc36 is in history

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

Change-Id: I4deb3483352d955859b7264dd604c2100b4b2f88