[automerger skipped] Merge Android 12 am: f3623d2d23 -s ours am: 2349d91aa1 -s ours am: 2a6dc75b49 -s ours am: af75b7043b -s ours
am skip reason: Merged-In Ia43d5fae534345b6120ae83cf6601240e2983466 with SHA-1 e74efa06c5 is already in history
Original change: https://android-review.googlesource.com/c/device/google/bramble/+/1847341
Change-Id: I50835285f1a68535fa83d25f37fc0a623685777b
This commit is contained in: