tree 1a2bcd88cb48a82119d0fc80623b36ffc867507e
parent 34615d6a0b3a24c15661a2e9c291cfe545b2dcb1
parent 72fb0e7c293d512dcec202458b94f6700ccdb8b8
author Yabin Cui <yabinc@google.com> 1677914244 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1677914244 +0000

Merge changes I3ba37e4d,Ie07246cd am: e7915e867d am: 72fb0e7c29

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

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