[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: 377a9d42 am: 3e9fc00e -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: Ia17d369bca2174ba1667d4af38137e2352e4f78a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>