Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom