Merge "Remove the obsolete field android.security.KeyStore.NO_ERROR" into main am: cc80ef8ca7

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

Change-Id: Ie225bc266b28e654c81af3d36cecb677e2f5de84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>