[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 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: I171f941622db5d623b4b129d5d5714c4a94f7dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>