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

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

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