Merge "Add ActivityOption to remove keyguard when an activity is launched."...

Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-qpr-dev am: 107dabed

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



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