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

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

Change-Id: Ieea68aa5c45048f1493b50fbbfc64f66fd006553