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

Bug: 180401296
Merged-In: I74f76260be0f78d089380e978c12ca63ebac799f
Change-Id: Ifba634467b8206622448eef9dd37c78e75aee0ed