Merge "Move KeyChainTestActivity to CtsVerifier" into mnc-dev