Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
am: 39608b8556

Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29