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

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

Change-Id: I3f95ab4f1218e592bba00c50ccd52415a66f9941