[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: 45173c5a0a -s ours am: 54c24e3249 -s ours am: 404d5181d1 -s ours am: a0f534d8dc -s ours

am skip reason: subject contains skip directive

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

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