Merge changes I2b3cf4b5,I6a8a5b40 into main am: e48ae55565 am: 25f3d1e31a

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

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