Android Mainline 12.0.0 Release 42 (7924123,com.google.android.art)
[automerger skipped] Mark ab/7061308 as merged in stage. am: f73cac2568 -s ours am: bec3fc158c -s ours am: b2a55f4303 -s ours

am skip reason: Change-Id I547e19057d0d784a1c57d929ac41135e3cbc3a1d with SHA-1 4900872960 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b4716990e182fa3ac976fb01141badb686e33f5