Merge changes I0c16f2e1,Ifb8722b1 into main am: 62183259a8

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

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