tree 27a8e2e98e9f13513acea42d044b227fc36b4f99
parent f794320b6e50a1dec94a396c71533f846deb8048
parent 48c28e2f363e5902f7d505af333917c84b115f0c
author Nan Wu <wnan@google.com> 1699379040 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699379040 +0000

[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into rvc-dev am: 9c2ddfc6c2 am: 2af67c0c80 -s ours am: c9892a6eb6 -s ours am: d280f3c1bd -s ours am: 1c7010d707 -s ours am: dc294be7b6 -s ours am: 48c28e2f36 -s ours

am skip reason: subject contains skip directive

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

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