Merge commit 'bc22989cf5d1069568b76056d871b5e5c75c2551' of sso://googleplex-android/platform/packages/providers/TelephonyProvider into HEAD
Change-Id: Ie9b3d3b737fd8b40590cf2e03f4660df6a6b674d