Merge changes I4fa301cf,I70ff9f6c into main am: 957b2b6912

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

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