Merge "Fix security bug for startActivityInTaskFragment" into tm-dev am: bb452aa0 am: e3ceefc9

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



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