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 am: e3f384b9

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



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