Add missing tags that have been added in KM 4.1 and earlier. am: 4a595bfe00

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1480376

Change-Id: I12bf314eb29baebd49b44c8b483c79a9e010905f