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

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

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