Android S Beta 1
android_merge_from_upstream: update to point to new branch

Bug: 188246907
Test: Ran to generate a merge commit.
Change-Id: I0e5262c53e52babdc61bbabcf23652bdb9621608
1 file changed