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

[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: b7b2856d -s ours am: 4dec8fea -s ours am: b1693fdd -s ours am: 4086446b -s ours am: 46427698 -s ours am: 00263934 -s ours am: 8454d7dd -s ours

am skip reason: subject contains skip directive

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



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