Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" am: 715e754115 am: 11e5071fbb

Change-Id: I63f2cdcd2240b842614093761390bad866ef091b