Merge changes Ifc7292eb,I1abc142f into main am: 5c82be29bb

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

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