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

Bug: 180401296
Merged-In: I50639ce2d780b0ebb5730fced59b75b5c3a9c13f
Change-Id: I22c0f89b7158c18834109f0a33df0377af687f03