Merge "Keystore 2.0: Silence common error on operation abort." am: 492ab3dd2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5b89c516a259b7bf3eb3e9daf442a3f46bf3ff5