Merge changes I0186bbff,I821cd5a2 into main am: e6d571292c

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

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