Merge changes I5e8d8109,Iec3d1c2b,I582f6fc0 into main am: ef52b98f7a am: 4cfa141678

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

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