tree 97bcc97a4a3ae9ea450a6f22cc8e9f2fd6dc8595
parent 7d723a0950921fa866e5f929cac649b628ba8adc
parent e4cafeb8e5edf5a06a256f24cb4ddec24b7293ed
author Christophe Pinelli <cpinelli@google.com> 1700606571 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700606571 +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 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: Ic522101f29b2d914dfc8b5962239ed62431a15f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>