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

[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 064be0ff am: 132d108d -s ours am: d19187fb -s ours am: 2002af68 -s ours am: 4093c244 -s ours am: ca561876 -s ours am: 40a16cf9 -s ours am: fd31324b -s ours

am skip reason: subject contains skip directive

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



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