Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED"
am: c559ff3937

Change-Id: I5586f43c01e490727dcda5f01e92b3de638b07ac