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

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

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