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

[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-dev am: 641f8674 am: 3742f9bb -s ours am: 1a674915 -s ours am: 4eefe6a4 -s ours am: f17e7dc7 -s ours am: f4a89ced -s ours am: d180cca4 -s ours

am skip reason: subject contains skip directive

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



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