[automerger skipped] Merge "startActivityForResult with new Intent" into...

[automerger skipped] Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb am: 72e4718e am: a1fea689 am: a6755d07 am: 38d0889d am: 2c4e70c5 am: d7c3b584 -s ours

am skip reason: Merged-In Id74e4b7ae261f2916eedaef04a679f83409a4b67 with SHA-1 1189e24e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671



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