tree 0beecdf174e00a76057b20314e133b7cba2092ab
parent 46427698e4fa10eeae1f0f33beb7f11a81758997
parent 4e813976557b6abac7f1d117660796643030b874
author Nan Wu <wnan@google.com> 1700521531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700521531 +0000

[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-v2-dev am: 2bb5270437 -s ours am: fc496ffbe4 -s ours am: 3c8b4759cc -s ours am: 4e81397655 -s ours

am skip reason: subject contains skip directive

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

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