[automerger skipped] Add ActivityOption to remove keyguard when an activity is...

[automerger skipped] Add ActivityOption to remove keyguard when an activity is launched. am: 36f0a83e -s ours am: 4d8b1e26 -s ours am: d51938de -s ours

am skip reason: Merged-In Ia83da6286875f1a539edbaf515fe01c07ce1ba76 with SHA-1 1df71d4e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18436742



Change-Id: I3cecf8f9c7c75307822851f78af33ff7ef20a3de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>