Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
Telecom: mark the Call as blacklisted

Change-Id: Ic12eb36fe77654cdeae275af5dd491eab6e7cde9
Signed-off-by: Roman Birg <roman@cyngn.com>
Telecomm: update blacklist activity name

Change-Id: Ia9ab58af85be7f011bf73ffbee9375671f223d23
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_packages_services_Telecomm into lollipop