tree e6aea8f43d24a6d878d5609131588461184d8601
parent 819f20feea1d9d970c0a5ace8ffc81b78bd88765
parent 492ab3dd2cac706e97a73bcf6111125586529d42
author Treehugger Robot <treehugger-gerrit@google.com> 1615214792 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615214792 +0000

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