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: caf5747b am: 7278e885 -s ours am: 3eba72a8 -s ours am: 590fc4a3 -s ours am: 2f191b17 -s ours
  [automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 8efec2c0 am: e6bce8f1 -s ours am: b01acc10 -s ours am: 79f7bf64 -s ours am: 5d12036b -s ours