Merge changes I2f5c2325,Ibce802ec into main am: bb4703b0ad

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

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