[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-dev am: 641f867473 am: 3742f9bbc1 -s ours am: 1a6749156b -s ours am: 4eefe6a465 -s ours am: f17e7dc711 -s ours am: f4a89ced68 -s ours am: d180cca4df -s ours am: 1966ab9b34 -s ours am: 832ae805a8 -s ours

am skip reason: subject contains skip directive

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

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