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

Bug: 180401296
Merged-In: I33b37419913bbd397207fb53212488ea3885aedd
Change-Id: I1c0b8db09fc7ab72285992daa29e49e7cee655c5