Android Mainline 12.0.0 Release 42 (7924123,com.google.android.art)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -s ours am: 4fe65eb0fc -s ours am: be53ce0dfb -s ours

am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3f128fe9e729665fff96236e4efaa0580aab730