Merge changes Idb157e12,I459352b4 into main am: 9c9460da76

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

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