Merge "Add ActivityOption to remove insecure keyguard when activity is launched." into tm-dev am: 215a637b am: d9a23024

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

Change-Id: I19499801f00dffb4c6d6e2a3c89fe43379a242c0