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: Ieb0fce934280c8bcf36b0c32e846270748386d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>