commit 75441ee9dd11647cb32584eb9323d864ca98ac4a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 07 21:33:56 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 07 21:33:56 2023 +0000
tree 3f7c02691c5cab525b4c09bec0a4022f3073ad3f
parent c8bfd1ab39657c0af81ebd3e5e35e7a3fb96c1ac
parent f477f4492ad4f57bff8aee8fde9dfa92a7f8cc13

Merge changes from topic "am-44faaae607c6468eb08955592c993a4d" into main

* changes:
  [automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-dev am: 641f867473 am: 3742f9bbc1 -s ours am: 1a6749156b -s ours am: 4eefe6a465 -s ours am: 45173c5a0a -s ours am: 54c24e3249 -s ours am: f834c4db1f -s ours am: 0293b4ff49 -s ours
  [automerger skipped] DO NOT MERGE Disallow Wallpaper service to launch activity from background. am: 064be0ffc5 am: 132d108dbf -s ours am: d19187fb4b -s ours am: 2002af6818 -s ours am: ee670e7a6a -s ours am: 7bb3870c2a -s ours am: 0b7eb47482 -s ours am: 54329f3037 -s ours