tree ea8330bb63d1d38dbc28de2793f8858d76d74e40
parent 548acf677e929d601e7fc7ec89132a037066ab28
parent cebc7a5b3769cdbaca1c29af997aed2d98c3a3a1
author Christophe Pinelli <cpinelli@google.com> 1700586944 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700586944 +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: 459ece6797 -s ours am: 798af2cf48 -s ours am: 13aeabe2fb -s ours am: cebc7a5b37 -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: Ie8ff1104496a5f8e0b0b979662c14eea8facc4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>