Merge "Add sound or vibration effect for network-initiated USSD" am: d572466c80 am: 37130c0349

Change-Id: Ia8b4726382376b9ef089dede8920609b31f60df7