[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 sc-dev am: d75dd811 am: 59dc1375 am: 9cd28ccd -s ours am: d3f5b996 -s ours

am skip reason: Merged-In Ie774b142a7fab12d596ccd64872b781e3825e9ba with SHA-1 3e9da3ec is already in history

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



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