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

[automerger skipped] Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into udc-qpr-dev am: 2f86e413 -s ours

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

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



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