Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
Make reverse lookup implement the phone number lookup interface (2/2)

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