Merge changes from topic "move_keymint" am: 249cdd49b6

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1522123

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie36585122b425a96128ac37b420b8fddd6eb6e0c