Merge "Launch app intent after unlock" into tm-dev am: ff1ae871 am:...

Merge "Launch app intent after unlock" into tm-dev am: ff1ae871 am: 1c458d35 am: 9e0cced1 am: af818c7a

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



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