Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into android12L-tests-dev am: 04747534f8

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

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