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

Bug: 180401296
Merged-In: I8504165b13a3532e19d4f966ce992d3c7feaa4ee
Change-Id: Iac84500b447f5ce38328f8fb8dcd7458853d114f