[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: 45173c5a -s ours

am skip reason: subject contains skip directive

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



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