tree c1d7043425408173045ba87986230513ec861527
parent ac6f8d438cda07718634199fdda49a01c186d208
parent 09fe7d7b481147f5a4220555a33a615de4093fb7
author Yabin Cui <yabinc@google.com> 1648835315 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648835315 +0000

Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48

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

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