Merge "Revert "Add USSD codes over IMS feature"" am: a027373f2d am: 962f149147

Change-Id: Idf1a85bfaeea94eadfea88f8e223a91e0d7b48c7