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>