Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev