Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
Fix group detail activity action bar theme.

Change-Id: Ic03b5d60a104512bf385090ea0a2003d13a6d49c
contacts: Add support for import contacts to local phone storage

This change allow to select the local storage account to add/import contacts
when others cloud/corporate accounts exists. If one or more account exists just
ask the user to select the destination account

Depends on: http://review.cyanogenmod.org/#/c/59353/

Change-Id: Ic055bdb09d037c2f2cdff06cd9a0159df87e2896
JIRA: CYAN-391
Issue: https://jira.cyanogenmod.org/browse/CYAN-391
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Import feature - auto prompt for importing SIM contacts

Change-Id: Ic7e039d35c0198855e910ecd7fe6e945b4b45302
Clean up multi picker activity.

Change-Id: Id8d66cf3ff5f806a053f40bd4d8db453ab292219
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_packages_apps_Contacts into lollipop