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

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

Change-Id: Icb7ab9f01771da52b4c78a4f59919b62d6c232fd