Merge "Test that sensitive information is stripped from ActivityOptions" into sc-v2-dev am: f70ab808dc am: 392875b5e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/19500411

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