Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
am: 7ee92d5291

Change-Id: I8bfb1fb9f96489d9d11cc1b587d78b6a08a130ed