Merge changes Ic1e88d3c,I86805b5f into main am: 30c351448d am: ea528e5ba4

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

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