Merge changes I2b3cf4b5,I6a8a5b40 into main am: e48ae55565

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

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