[automerger skipped] Merge "Restrict activity launch when caller is running in...

[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into tm-dev am: 5f74ebdf am: a280c0d0 -s ours

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

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



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