[automerger skipped] Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into tm-dev am: 7ace523bbc am: 40799525b5 -s ours am: d39249f842 -s ours am: a57dea64ba -s ours am: c684adcfac -s ours am: bac7e94439 -s ours

am skip reason: Merged-In I873ae576de0bc4a7402c2f522b45853bce48a0c5 with SHA-1 703bc57a6f is already in history

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

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