Merge commit 'db0f31d32afde649b6ed1b839004c073fe848f21' of sso://googleplex-android/platform/packages/services/Telephony into HEAD
Change-Id: I99edadb129b4cdb803815a87009fae8540c9fb92