Merge changes I0c16f2e1,Ifb8722b1 into main am: 62183259a8 am: 790e77605d am: 0dcc44e2ad am: 703bcd5c99 am: c2ee9f5216

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

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