[automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: c228e8f411 -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: Ibc7c8529fbc1fea6672021f0ea4a79178c15e089