Android CTS 6.0 release 2
Merge remote-tracking branch 'goog/mnc-cts-release' into HEAD