Android CTS 7.1 Release 6 (4009365)
Merge "release-request-df3758e5-899f-46f0-8851-2c684d4eeabc-for-aosp-nougat-mr1-cts-release-4003927 snap-temp-L31600000064050208" into nougat-mr1-cts-release