Android o preview 2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlkjLIIACgkQ6K0/gZqxDnjEagCgiYZ3BEb8pFOaU11vF6h8k2BD
vpIAn3dZMBLj+OxBEZaH3I9oEW8bGi5r
=x2EJ
-----END PGP SIGNATURE-----
Merge "Remove an Android change that is causing a test to fail"
am: 49edf3ace6

Change-Id: I5a86265b57641be1ddd39c073588aa33d99e5b27