Android S v2 Preview 2 (S2B2.211203.006)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 56c4fadf57 -s ours am: 4d461cf440 -s ours

am skip reason: Change-Id I0670e886f4cf6f726fb76023d2d07ee1c1a18718 with SHA-1 6fd34885b7 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bf40c77a30c59cfeeddd713dad21085dfbe18df