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

Bug: 180401296
Merged-In: I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f
Change-Id: I3ad6ab4a3b9edea1cb083d3ea392ae16298805bc