Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1 am: a9827dcd26

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159

Change-Id: I8fc6e6dfe3b35479434188fcef7f181894ff18de