[automerger skipped] Merge 10952656 am: d888d7aa3b -s ours

am skip reason: Merged-In Id41c86d1f6098244dc91bb8e0c689f3015cf6755 with SHA-1 c7b6215118 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull/+/25090357

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