Android o preview 2
Merge "Remove an Android change that is causing a test to fail"
am: 49edf3ace6

Change-Id: I5a86265b57641be1ddd39c073588aa33d99e5b27