Merge changes Ic9b9fe35,Id2252594,I8586a4a2 into main am: 270c82d109 am: db9369b1c0 am: 5071dc1506

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

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