Merge "Disable testMapsApp test due to a UI bug. Test: Local Change-Id: Ie10b304eba978902d008aa7dc6bf948268c7b7d1"
am: 820dd34f1f

Change-Id: I026ee91bfdab8ad434a688a54bc225a7be246554