tree 2d73ed736bd6848747a18ba4bac571b2d09aab83
parent 797738adf052b02169c4fce46f6af69ca1833472
parent 455a97b7b535bbd301477b0af94f08eade9e488e
author Christophe Pinelli <cpinelli@google.com> 1700612466 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700612466 +0000

[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into rvc-dev am: dce6a262f7 am: f3e0e019b6 -s ours am: 44cf76a444 -s ours am: a43fce1d35 -s ours am: e8d5e56e47 -s ours am: 192afbf336 -s ours am: a338885858 -s ours am: e4cafeb8e5 -s ours am: 910d4f5a5c -s ours am: 1a570d9957 -s ours am: 455a97b7b5 -s ours

am skip reason: Merged-In I1a0c13e74622d301866efaca1b5351a6b241ebe5 with SHA-1 d54a64bdf7 is already in history

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

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