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

[automerger skipped] Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into udc-dev am: 265baa61 am: 36e3011e -s ours

am skip reason: Merged-In I873ae576de0bc4a7402c2f522b45853bce48a0c5 with SHA-1 7602e198 is already in history

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



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