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

[automerger skipped] Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into tm-dev am: 7ace523b am: 40799525 -s ours am: d39249f8 -s ours am: a57dea64 -s ours

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

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



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