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

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

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