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