Android Mainline 12.0.0 Release 22 (7927206,com.google.android.art)
[automerger skipped] Mark ab/7061308 as merged in stage. am: e9a427a9f9 -s ours am: 225298a648 -s ours am: 07acdb8c3a -s ours

am skip reason: Change-Id Iaffcc280dc7f3a60dfe63cdd30f7e830a14dbc01 with SHA-1 b29bc05c89 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b884fd5ce53c12599b419d0260fb425170014e3