Merge changes I5feed821,If80b3bf9 into main am: 6006378a3d

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

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