Android S Beta 2 (SPB2.210513.007)
Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: Ib481bb8f5fe6d185ca0af92fad929210607c2d5e
Change-Id: I3b2b53f62121f244edda650b840da2b4c2bea19a