[automerger skipped] Merge "Add ActivityOption to remove keyguard when an...

[automerger skipped] Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-d1-dev am: a198a652 -s ours am: 27a11f47 -s ours am: 80695f75 -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: I32777a04db3e87e189cf1b873a67b4d42f1b7311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>