[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: e6bce8f1 -s ours am: b01acc10 -s ours am: 6d6e1bfa -s ours am: 8c687324 -s ours

am skip reason: subject contains skip directive

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



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