tree ad965d6ea05dad0969b98c4018f9f06933f1f463
parent adf9c617091646975b891b9d2cefa79b67094284
parent 548acf677e929d601e7fc7ec89132a037066ab28
author Christophe Pinelli <cpinelli@google.com> 1700588919 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700588919 +0000

[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into sc-dev am: d75dd811c5 am: 59dc1375f4 am: 9cd28ccd7c -s ours am: d3f5b99607 -s ours am: 93213f9417 -s ours am: b1fb7ea501 -s ours am: 9cc34f412b -s ours am: 548acf677e -s ours

am skip reason: Merged-In Ie774b142a7fab12d596ccd64872b781e3825e9ba with SHA-1 3e9da3ec47 is already in history

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

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