Merge "Fix security vulnerability allowing apps to start from background" into...

Merge "Fix security vulnerability allowing apps to start from background" into sc-dev am: 408cac13 am: 3b2f30df am: 6a8afefe am: 2b60d838 am: 65149085 am: 8c62197e am: 32e83bd0

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



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