Merge changes from topic "am-5b4c4bc1eceb4423bcfa9146374bb71b" into main

* changes:
  [automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into tm-dev am: caf5747b97 am: 0fdf65c7b0 am: 65ea565903 -s ours am: 20530ad7b0 -s ours am: 7246c76598 -s ours
  [automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 8efec2c095 am: 1b7d87139c am: 82baf6404d -s ours am: 4e443c40c5 -s ours am: b3ad94dc76 -s ours