Merge "Add USSD codes over IMS feature" am: e696f45471

Change-Id: Iedc97b930523b5c3d5078cd4d586a9f3541c7ed7