Android mainline 12.0.0 release 5
[automerger skipped] Mark ab/7061308 as merged in stage. am: 7965b95af4 -s ours am: cc9999ea18 -s ours am: 037d2cbffa -s ours

am skip reason: Change-Id I5fb0fd21e21036c4a9774c0ad17b7f5c663b576a with SHA-1 72446da6f3 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I323be92b096a60a53b99bdb3fa5f7e568c7e1c9c