Merge "Merge existing bundle with ActivityOptions" into sc-dev am: a83514ec am: b1b5bf42 am: 9e5cc241

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

Change-Id: I7c54ad1619e006b803ac4d3dfe123ef1a0bbc981