[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 udc-dev am: 82456ff9 am: b4c7a4e5 -s ours

am skip reason: Merged-In Ie3bc5bd88bfd3bd4777210c0740ad34ea6d3311e with SHA-1 e3c537dd is already in history

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



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