Merge changes I4fa301cf,I70ff9f6c into main am: 957b2b6912 am: 09c5b39fcb

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

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