[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: ee670e7a -s ours am: 7bb3870c -s ours am: 89530914 -s ours

am skip reason: subject contains skip directive

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



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