Merge "Switch goldfish to use keymint" am: 087220cbe1 am: dbb0c86bcb am: 497401c924 am: db826d5266

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1943748

Change-Id: I64953ed26060b4a2162de49ff967d7dd92549f2c