Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
Fix phone number returned by 'Das Telefonbuch' for business numbers.

Some obfuscation spans are inserted into the HTML for whatever reason.

Change-Id: Ib69dac5c79b01947d6085bf27b61c0f7a4d73a4c
Make reverse lookup implement the phone number lookup interface (1/2)

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