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

Change-Id: I6ca057091b1ed77c0aa5b9859092f392dcb5cdac