Android N IOT Preview 4 (NIH40E)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkc8OUACgkQ6K0/gZqxDnhFAQCggbpuDyf8QgY7xSz3yzXWF97v
NNcAnRAoD+4d7ybrQR1caHeoq7xaaPCR
=0iXH
-----END PGP SIGNATURE-----
Merge "Remove an Android change that is causing a test to fail"
am: 49edf3ace6

Change-Id: I5a86265b57641be1ddd39c073588aa33d99e5b27