Merge changes Ia9725aaf,I568a78af into main am: 5a9c0a14e3

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

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