Merge "Modify AttestationUtils to use public Keystore API" am: 7a46c3c1fd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622922

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6505041a28e1aa2d1fa9bb6e64508b7090a67777