Merge changes I6905e8b5,I194a387c,Ia80fac97 into main am: f7d8406bac

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

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