Android Mainline 12.0.0 Release 42 (7924123,com.google.android.art)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 442b46cd11 -s ours am: 97199e2b9c -s ours am: 544260684d -s ours

am skip reason: Change-Id I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 with SHA-1 5e08b7cf6c is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8538e06af69a94c0f0ca83bbfc81a4ec52105995