Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387126

Change-Id: I9389e2226554123fd25844c27aa24e6b13466124