Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from...

Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into tm-dev am: caf5747b am: 0fdf65c7

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



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