Android 12.0.0 release 26
[automerger skipped] Mark ab/7061308 as merged in stage. am: 38b91cbfd6 -s ours am: 9123f6d21e -s ours

am skip reason: Change-Id Ia7429fd7c84d27fb6872987c32b3e90d97c80647 with SHA-1 0c86dcb75a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ee846c21b0fc4fe02791a04d354e998d037af1c