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

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

Change-Id: I9b78ca9a24fa943acb3981c03a93dc7fa59d5c63