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

Change-Id: I775213ed764cec2fb3c5791949a83fa9fc675a37