tree 08a7095e10ebfed65e37d273d8b591e69ddaf3d2
parent 1c79e91ef8109b5bed99ea58916a9fb0b2269c67
parent 9e4a5f21c39f90617912405b390d9f6c0ac0f5d0
author Louis Chang <louischang@google.com> 1672970585 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1672970585 +0000

[automerger skipped] Merge changes from topic "presubmit-am-711e8625e1514f8785791e865e5a4d7d" into sc-qpr1-dev am: 53e52704b6 -s ours am: 5e7f43a14d -s ours am: 1a2e48eba1 -s ours am: 9e4a5f21c3 -s ours

am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

Change-Id: I8ee77bed434676af492398dd9bcaeef4535d05c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>