Android Mainline 12.0.0 Release 22 (7927206,com.google.android.art)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a2f47fb4d -s ours am: 9d7b7ea290 -s ours am: 8865b07dcd -s ours

am skip reason: Change-Id Iabd99c8e1402415056eaa16e89966f24798504b8 with SHA-1 b25ef8aabe is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d656835444b0779738ad19d282673fb6f6345ec