[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: e3f384b9 am: 8f988ac4 -s ours am: 1456fb34 -s ours am: c89179da -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: I5aaf71277f33c1792f82fc3d1f3a1e7752dccd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>