Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b3cd4669

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396

Change-Id: I107d380ed11bd50a04cc75e799fd2b45e589aadd