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

Bug: 180401296
Merged-In: I3b7b35ce962378c5d7ae0776922b1a36cdad1d67
Change-Id: I837bb65d98b3e1e8a788fb68fd3acc480ff4f614