Merge changes Ic1e88d3c,I86805b5f into main am: 30c351448d

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

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