[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch...

[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 8efec2c0 am: 1b7d8713 am: 82baf640 -s ours am: 4e443c40 -s ours

am skip reason: subject contains skip directive

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



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