Android CTS 6.0 Release 20 (4120755)
Merge "release-request-4508f19d-e487-4105-a2ae-536ccb547bbf-for-aosp-marshmallow-cts-release-4118095 snap-temp-L45400000076205659" into marshmallow-cts-release