Merge \"Disable CTS wildcard-policy autoVerify test\" into nyc-dev
am: 5ef048c114

Change-Id: Ia9067ba05e996d9526260d071650081db4a0642e