Android CTS 7.1 Release 7 (4120758)
Merge "release-request-3bbf0ceb-b357-4830-a47a-4cfc1eca2f10-for-aosp-nougat-mr1-cts-release-4118151 snap-temp-L47100000076205962" into nougat-mr1-cts-release