tree 3e22c361ecffc819adf39d6ec5ce3d8391939606
parent 147e4c6034b9b2816e787a8e8aef34b815fe461c
parent e674d291c41b295a52f80ee064b639903da71073
author Yabin Cui <yabinc@google.com> 1698268043 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698268043 +0000

Merge changes I646640c3,I3f464c55 into main am: e674d291c4

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

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