Merge changes I9078e326,I95a1494a,I69e609d4,Ie893ae8c into main am: ca4dc3e384

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

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