tree 043ff3c241ae184678a36bcc8133f805d9fed8fb
parent c36e7ace54301cb9c1d4f24053bed1566cc2a861
parent b00da15592c3ed032a2abbcc186046091a00ff5a
author Nan Wu <wnan@google.com> 1699387071 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699387071 +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: 4dc2c6760b -s ours am: 2cf905eeb3 -s ours am: 2b763bd19e -s ours am: 122f693b91 -s ours am: 1128302840 -s ours am: b00da15592 -s ours

am skip reason: subject contains skip directive

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

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