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

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



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