[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: b7b2856de6 -s ours am: 4dec8fea1d -s ours am: 5ff719c566 -s ours am: 84ec497c78 -s ours

am skip reason: subject contains skip directive

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

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