[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 064be0ffc5 am: 132d108dbf -s ours am: d19187fb4b -s ours am: 2002af6818 -s ours am: ee670e7a6a -s ours am: 7bb3870c2a -s ours am: b44a1dd4e6 -s ours am: c79741e7ba -s ours

am skip reason: subject contains skip directive

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

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