[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: b7b2856de6 -s ours am: 4dec8fea1d -s ours am: b1693fdd0c -s ours am: 4086446baf -s ours am: 46427698e4 -s ours

am skip reason: subject contains skip directive

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

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