Merge changes Id73cdfa8,I08951eec into main am: bd41370cd7

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

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