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

Bug: 180401296
Merged-In: Idc6eea7089eb139029872414b517da7d22560d6b
Change-Id: Ie6cac09a9b513e3712e1160d7d264161dddafa90