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

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

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