Merge "Convert argument to intent in ChooseTypeAndAccountActivity" into qt-dev am: e5ca4abcaa am: 3f5a4111e0 am: 1ff659dc39 am: 874161de30

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

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