Merge changes I7b8a7a36,I38829ec8 into main am: 07f13d8da0

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

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