Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" am: 715e7541 am: 11e5071f am: 406f067b Change-Id: I1e7159c7110dfd157f25d36bcfe75c56de8e026c