Merge changes I0d3398fe,I983045d0 into main am: e0518eb3cc

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

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