[automerger skipped] Merge "Keystore 2.0: Remove attestKey from KeyChain." am:...

[automerger skipped] Merge "Keystore 2.0: Remove attestKey from KeyChain." am: eb45aabc am: c5792c39 am: ccef3d83 -s ours am: e715d99b -s ours

am skip reason: Change-Id I759fe245b48fe435153fded2c74c9ae99634c146 with SHA-1 0f138dc0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ec1e6530b446082279473d71b20c81ab37c5473