[automerger skipped] Pass SafeActivityOptions with actual caller for startActivityInTF am: 7602e19872 -s ours

am skip reason: Merged-In I873ae576de0bc4a7402c2f522b45853bce48a0c5 with SHA-1 20c568e77e is already in history

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

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