Merge "Ignore INVALID tags in generated key characteristics." into main am: a7c14a69f6

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3166117

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