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

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

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