Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"