Merge changes I44753857,I64c04ab5 into main am: c728b91ba4 am: 4f26140490 am: cf27414fd0

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

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