[automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: c228e8f411 -s ours am: bdf80cf9aa -s ours am: cd4a56d9b5 -s ours am: 2d418fef38 -s ours

am skip reason: Merged-In Ibc2f99ba766419fdb491c49317b9fb5ae13138ef with SHA-1 9290fc7b9d is already in history

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

Change-Id: Iea8e8d4a339e06605c34581871e0c3cb8b2d3a91