Merge changes from topic "am-8d17eeb7614f45f6b240a8f4471078d0" into main
* changes:
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into tm-dev am: caf5747b97 am: 7278e885d8 -s ours am: 3eba72a803 -s ours am: 590fc4a3b8 -s ours am: 2f191b1714 -s ours
[automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 8efec2c095 am: e6bce8f1cd -s ours am: b01acc103d -s ours am: 79f7bf640f -s ours am: 5d12036bb2 -s ours