Android S Beta 4
Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I465b91828bff215ec01de8bcd5c31e4ac1742cbc
Change-Id: Iafcb32644619a7275d56d8a762b19373bf35029e