tree b93b7b900a589214e5776bc8ce41f7cf0dc429d6
parent 7bb76c7976634a2e3945aaa348ed75b83983eba1
parent 72619a29468aeebb2c68da67f9bbc3f4e32baba9
author Nan Wu <wnan@google.com> 1699383736 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699383736 +0000

[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: 72619a2946 -s ours

am skip reason: subject contains skip directive

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

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