Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into udc-dev am: 265baa61f4

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

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