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

Bug: 180401296
Merged-In: I395973694367a1ab04cf8b3c3a3a3df5ac63cd52
Change-Id: I53b8b7b8ffe0b8807c1824780c72b0ddd9e83225