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

Bug: 180401296
Merged-In: I2f321cb7a3f813b791c6707eb6cc2f320694ae9d
Change-Id: Ic7ae84fe64aa04b4160b00c7cb0db03d965f7357