tree bf67a4b877eb806815ad007f6496e65bda9a6d8e
parent a7f9e8c8514f32948d503d95fc51535efc931537
parent 790e77605d8f416474e37824b9a94563b727f4fb
author Dennis Song <denniscy@google.com> 1688701038 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1688701038 +0000

Merge changes I0c16f2e1,Ifb8722b1 into main am: 62183259a8 am: 790e77605d

Original change: https://android-review.googlesource.com/c/platform/development/+/2646760

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