Merge changes I0c928f19,I0dc6db3c into main am: e70918a6d9

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

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