Android CTS 5.1 Release 20 (3993894)
Merge "release-request-afa32ec1-6e5a-4d62-b748-0f4ff6647ff2-for-aosp-lollipop-mr1-cts-release-3990458 snap-temp-L73600000062473699" into lollipop-mr1-cts-release