Merge "Test for KeyStoreException during unique ID attestation." into oc-dev am: a21c2b3ac9
am: c761147046

Change-Id: Ib3dbb22c9f0ff78a1eba8773351c839d29fe0f0a