tree b3c4294e0192709ce3aaa43077b2ce804b4616e5
parent 733b92fdbb65f91068e2c29cf764c9b663432ff9
parent 5dcc52efb0addfea45d77ee60e219a94104b291d
author Yabin Cui <yabinc@google.com> 1677645540 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1677645540 +0000

Merge changes If02a3990,I92106608 am: 2b31e17d15 am: 2e08a01c5b am: 5dcc52efb0

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2461554

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