[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: 811913a9 -s ours am: 7407517d -s ours

am skip reason: subject contains skip directive

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



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