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

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

Change-Id: I2802c6df6689f9fa2a0107fcdd1e0047616532ba