[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 rvc-dev am: 9c2ddfc6 am: 2af67c0c -s ours am: c9892a6e -s ours am: d280f3c1 -s ours am: 1c7010d7 -s ours am: dc294be7 -s ours am: 4dc2c676 -s ours am: 2cf905ee -s ours am: 2b763bd1 -s ours am: 515cc938 -s ours

am skip reason: subject contains skip directive

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



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