Merge changes I646640c3,I3f464c55 into main am: e674d291c4

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

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