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

Bug: 180401296
Merged-In: If3911be0b4ebb872b1c0630013afc7627b484548
Change-Id: Icae2afb484a5b94889ab4dd0f90035723513650f