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: d8f6763c am: a18b2410

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



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