Merge changes I4249d38e,I9e5c520a into main am: 4fc630eea6

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

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