Merge "Keystore 2.0: Remove attestKey from KeyChain." am: eb45aabc03

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a9df17baef8fa083673a2bb2b117fd112f209a4