Merge changes I2f5c2325,Ibce802ec into main am: bb4703b0ad am: 52b52eb2eb am: 57bb84f65a

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

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