Merge changes I5a2e2871,I53b1f37e,I693ea16a into main am: e1c97bd7e9 am: 202bd7bd98 am: 2413c34f7f

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

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