Merge "Convert argument to intent in ChooseTypeAndAccountActivity" into qt-dev am: e5ca4abcaa am: 3f5a4111e0 am: 1ff659dc39 am: 874161de30 am: f02cbc8f7a am: 1dea09d8f9 am: 7107fe0c76 am: a745b401e0 am: 6400fcedad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20541824

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