Android Mainline 12.0.0 Release 42 (7924123,com.google.android.art)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 678be469e3 -s ours am: 79afc4ee63 -s ours am: a09335b8cf -s ours

am skip reason: Change-Id If3911be0b4ebb872b1c0630013afc7627b484548 with SHA-1 35f4807790 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I431d3c1a1a6ffd0e5164f966d1f9a9b180d72d1f