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

Change-Id: I400130c5126d718d71be7daf5e0685f44eaebd27