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

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

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