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

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

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