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

Bug: 180401296
Merged-In: I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd
Change-Id: I1ee202ad4406a0a858d84f13ea5a705ec61f85a0