Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937 am: c58c139801
am: 9c5b803a88

Change-Id: I044188282872292fc745bf85b4e3ca8126ce8a43