Merge "Convert argument to intent in ChooseTypeAndAccountActivity" into qt-dev...

Merge "Convert argument to intent in ChooseTypeAndAccountActivity" into qt-dev am: e5ca4abc am: 3f5a4111 am: 1ff659dc am: 874161de am: f02cbc8f am: 1dea09d8 am: 7107fe0c

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



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