Merge changes I44753857,I64c04ab5 into main am: c728b91ba4

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

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