Merge "KeyStore: Limit the Attestation Application ID" am: 1ca2dafcff
am: dd48cf17ae

Change-Id: I369dc580624784c278e111a7aeee61b1602d852f