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

Bug: 180401296
Merged-In: I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7
Change-Id: Id8cbc41fe4fd5af8685d13b2a6effffd110a9dc4