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

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

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