Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into tm-dev am: 7ace523bbc

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

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