[automerger skipped] Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-d1-dev am: a198a65234 -s ours am: 27a11f47d5 -s ours
am skip reason: Merged-In Ia83da6286875f1a539edbaf515fe01c07ce1ba76 with SHA-1 1df71d4e7b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18436742
Change-Id: Ib429972529623680fe7fc1b2840e59c5c24a88fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: