tree 2f08c625716f6d9bfd180d918df25d617540e6e5
parent bc96985da7458b0d8caa38ef4da1978e57de83a3
parent 0293b4ff496c7eb579e71bbd9bee43ec4931c2dc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1699392791 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699392791 +0000

[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

am skip reason: subject contains skip directive

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

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