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

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

Change-Id: I49ef52ac52e3f1a516b886af8ebb45e3b641f3fd