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

Merge "Launch app intent after unlock" into tm-dev am: ff1ae871 am: d774ce12 am: 63277637 am: 85272c21

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



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