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

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

Change-Id: I49be5fdfa6d47b05edb9642af0d28ac99ad487fb