Merge changes Ia9725aaf,I568a78af into main am: 5a9c0a14e3 am: c3f1ba9eba am: 39dd96bf9b am: a56aca5c70

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2734299

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