Merge "Merge "Fix security bug for startActivityInTaskFragment" into tm-dev...

Merge "Merge "Fix security bug for startActivityInTaskFragment" into tm-dev am: bb452aa0 am: e3ceefc9 am: 0869bc58" into tm-qpr-dev-plus-aosp am: 25d228a3

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



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