tree ad965d6ea05dad0969b98c4018f9f06933f1f463
parent e15983ac2252c6fd46ddc31e05d7ac5dbf7dc043
parent 0f01b8717729fbecf0f4f7b5634216b5fb1bd1c2
author Christophe Pinelli <cpinelli@google.com> 1700532733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700532733 +0000

[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into tm-dev am: 5f74ebdf62 am: e3f384b963 am: 8f988ac497 -s ours am: 1456fb3432 -s ours am: 0f01b87177 -s ours

am skip reason: Merged-In Ic88dd1e79b867b44cdcd6fc86650f5de6ebcc23d with SHA-1 e1edaa27ea is already in history

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

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