Merge "Fix security vulnerability allowing apps to start from background" into sc-dev am: 408cac13c0 am: 3b2f30dfc9 am: 6a8afefe7d am: 2b60d838b9 am: 6514908583 am: 8c62197e4e am: 32e83bd062

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>