Android CTS 6.0 Release 23 (4337277)
Merge "release-request-23700776-ece5-4169-b70a-14ee7a6b7bf9-for-aosp-marshmallow-cts-release-4333970 snap-temp-L52100000102648065" into marshmallow-cts-release