[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-v2-dev am: 2bb5270437 -s ours am: fc496ffbe4 -s ours am: 811913a928 -s ours am: 7407517df1 -s ours am: 77e4329b13 -s ours am: 030e8bc866 -s ours

am skip reason: subject contains skip directive

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

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