[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 rvc-dev am: dce6a262 am: f3e0e019 -s ours am: 44cf76a4 -s ours am: a43fce1d -s ours

am skip reason: Merged-In I1a0c13e74622d301866efaca1b5351a6b241ebe5 with SHA-1 d54a64bd is already in history

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



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