[automerger skipped] Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis" am: cbfaae4f0c am: 45c9075453 -s ours
am skip reason: Change-Id I6d394fae478ef62769147beaeb944771a67aca70 with SHA-1 87941e4fa1 is in history
Change-Id: I961b141cd6c308fb526df7de9c9de7ed6a3800fc
This commit is contained in: