tree d7deb603315a246cf1f11c17202c756ebfa5d14e
parent ca05a906a742bcadf26fa2a66cf54d92ae7ee4bc
parent 4453934e28d94a2c8e2597f18284dd59833d0955
author Haining Chen <hainingc@google.com> 1706053407 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706053407 +0000

Merge changes I9115b707,I1912b8ad into main am: 4453934e28

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

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