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

Change-Id: I52a93678621d3d28e88cd7cdbfbfca3c2a96f0b2