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

Bug: 180401296
Merged-In: I547e19057d0d784a1c57d929ac41135e3cbc3a1d
Change-Id: I7a0b3f5001fd673ab422a60867e069f397c17b71