Merge changes I7b8a7a36,I38829ec8 into main am: 07f13d8da0 am: 287d82aaf7

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

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