base: Phone number location support [Squashed] (1/2)

Change-Id: I71d897ec4dc7f6a2c755b9f9f088686ddd082429
Fix SysUI force closes caused when enabling lockscreen notifications

This was accidentally removed in this commit: https://github.com/cristianomatos/android_frameworks_base/commit/3ddbdc27025c6e3060af0704e95ca4d85812c937

Change-Id: Ib4f76fb6b1ea903537b0ce628b51ae5336f18c53