[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: 444d0bb0 -s ours am: 9f91e65f -s ours am: abec13b3 -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: Ibfe94a06477dfc91fe79960eca9dca4c2108e70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>