Android 12.1.0 release 11
[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -s ours am: 4fe65eb0fc -s ours

am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8e38b4a2a7cd181aebddc17ee0ab21f8cfd0134