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

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

Change-Id: I20bc20045e7d05168e8cd512c33bd9ae49baef26