[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 tm-dev am: caf5747b am: 0fdf65c7 am: 65ea5659 -s ours am: 20530ad7 -s ours am: 7246c765 -s ours

am skip reason: subject contains skip directive

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



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