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

[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 4c065abf am: 2ffa1caa -s ours am: 8f8162b2 -s ours am: 73075478 -s ours am: e689a380 -s ours am: 9c877e79 -s ours am: 46fb6ba7 -s ours am: f794320b -s ours am: 734f0178 -s ours am: 34c28a47 -s ours

am skip reason: subject contains skip directive

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



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