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

Bug: 180401296
Merged-In: If5ae74f91003e5833867f94b4b1c5cee4ee08206
Change-Id: Ie642e9e49784f65308deee9eccaeaeb7450a93bb