Merge "Restrict activity launch when caller is running in the background" into...

Merge "Restrict activity launch when caller is running in the background" into tm-dev am: 5f74ebdf

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



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