Merge "Remove KeyMint TODOs" am: 45e16a09ca am: 4d2be4b6a5

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

Change-Id: I906ccb9f8d121af9235c4d8398e9170b4e19c581