Merge changes I44753857,I64c04ab5 into main am: c728b91ba4 am: 0bf54481e7 am: f909815136

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

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