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

Change-Id: Ibe7b65f26c4fbf09c2638d779b5d97120a7cca3b