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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I748c8b9f0b830d66c226478da714ce6e77f0752f