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