Merge "Keystore 2.0: Add permissions and policy for user manager AIDL."