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

[automerger skipped] Pass SafeActivityOptions with actual caller for startActivityInTF am: 703bc57a -s ours am: 38f81f08 -s ours am: acd436b6 -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: I438daaedfb4202148ccdf5933d4835396a4f768a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>