Merge "Disable testMapsApp test due to a UI bug. Test: Local Change-Id: Ie10b304eba978902d008aa7dc6bf948268c7b7d1" am: 820dd34f1f am: 7ab63c2204 am: 6d813b9c64
am: 1d690f931b

Change-Id: I401c1c17156d931d9a05bb4858e26a74fba67f96