Merge changes I646640c3,I3f464c55 into main am: e674d291c4

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

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