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