Merge "Allow keystore to access KeyAttestationApplicationIDProviderService" am: 1a640f32 am: 8e74f2f8 am: 5c3b1cdd am: 8963e937 Change-Id: Idc6449e0bbd80f5cce378307cd7f7c3594524c4e