Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937
am: c58c139801

Change-Id: I9b23f7d28c99cf368a7d32c6513f3a8091652bb3