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

Change-Id: I0d0c1be195ec894570c1fcbebca3f8b3298b1b34