[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: 5ff719c5 -s ours am: 84ec497c -s ours am: 2f1ebcf5 -s ours am: 1f6d97da -s ours am: 4032ad3f -s ours

am skip reason: subject contains skip directive

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



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