Android mainline 12.0.0 release 96
[automerger skipped] Mark ab/7061308 as merged in stage. am: 5c8a27f88a -s ours am: 17d182aab0 -s ours am: e4e90b75b2 -s ours

am skip reason: Change-Id I8c313b95aed25064bcb98ac32a90c51b6bc3008d with SHA-1 d36ba380da is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9117e6f08812cf34b0110a46b1246c33a46fe618