[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-v2-dev am: 2bb52704 -s ours am: fc496ffb -s ours am: 3c8b4759 -s ours am: 4e813976 -s ours am: 41f0b2f4 -s ours am: 637c8a86 -s ours

am skip reason: subject contains skip directive

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



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