Revert "DERP"

This reverts commit 0a3966dbbebd43e93505b683b9a0bbb67168dd4c.
Revert "Add People Lookup settings"

This reverts commit 18555f7fecae1845d63a8c5f65d993f998b3966a.
Add People Lookup settings

PS3: fix derp
PS4: rebase
PS5: fix authorship

Change-Id: Ic10f39730660b3b2e0b89b3ce1e8e78783899db3
Merge branch 'kk-new' of github.com:X-ROM/android_packages_services_Telephony into kk-new