[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: cadbfc0c am: ae7acf70 -s ours am: 6f83164a -s ours am: 5efd44a3 -s ours

am skip reason: Merged-In Id74e4b7ae261f2916eedaef04a679f83409a4b67 with SHA-1 2f53e6ab is already in history

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



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