Merge "Add Keymaster4.1 definitions." am: 09b2f93ab9

Change-Id: I13dc50025f85e97a5dedb904d09ffb49929f599b