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

Bug: 180401296
Merged-In: I60c5d53d2c2322727140a29acf1bbe884ed3f093
Change-Id: Id8dfe5b87b185678db4c6c258ecdfe6e3fd38aee