[automerger skipped] Merge "Pass SafeActivityOptions with actual caller for...

[automerger skipped] Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into tm-qpr-dev am: 32e2f549 -s ours am: 5d6aa704 -s ours am: 0f8c17b4 -s ours

am skip reason: Merged-In I873ae576de0bc4a7402c2f522b45853bce48a0c5 with SHA-1 198f7b55 is already in history

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



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