[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 555fcf363d -s ours am: 0ac8013345 -s ours am: 8c4c87cedf -s ours am: a1988173d3 -s ours

am skip reason: Merged-In I35e0117d296d24ebdd5384365e1fc48b61584c51 with SHA-1 9bab0eb34d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/dragonboard/+/17544494

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